Tweak how we mark ourselves in UA, so that fonts.g.c recognizes us proxying IE11 as IE11.

morlovich · morlovich · commit f3639e84c019 · 2016-01-26T18:01:25.000-05:00
(Will also need a similar change to nginx native fetcher) Fixes apache/incubator-pagespeed-ngx#1080
diff --git a/pagespeed/automatic/system_tests/inliners.sh b/pagespeed/automatic/system_tests/inliners.sh
@@ -35,6 +35,19 @@ EOF
   OUT=$($WGET_DUMP $URL)
   check_from "$OUT" fgrep -qi ".eot"
   check_not_from "$OUT" fgrep -qi ".ttf"
+
+  # And now IE11.
+  export WGETRC=$TESTTMP/wgetrc-ie11
+  cat > $WGETRC <<EOF
+user_agent = Mozilla/5.0 (Windows NT 6.1; WOW64; Trident/7.0; rv:11.0) like Gecko
+EOF
+  # This should get a woff font. (We used to confuse things so that it would
+  # produce ttf).
+  fetch_until $URL 'grep -c @font-face' 1
+  OUT=$($WGET_DUMP $URL)
+  check_from "$OUT" fgrep -qi ".woff"
+  check_not_from "$OUT" fgrep -qi ".ttf"
+
   export WGETRC=$WGETRC_OLD
 fi
 
diff --git a/pagespeed/system/serf_url_async_fetcher.cc b/pagespeed/system/serf_url_async_fetcher.cc
@@ -595,8 +595,8 @@ void SerfFetch::FixUserAgent() {
     user_agent += "Serf/" SERF_VERSION_STRING;
   }
   GoogleString version = StrCat(
-      " ", kModPagespeedSubrequestUserAgent,
-      "/" MOD_PAGESPEED_VERSION_STRING "-" LASTCHANGE_STRING);
+      " (", kModPagespeedSubrequestUserAgent,
+      "/" MOD_PAGESPEED_VERSION_STRING "-" LASTCHANGE_STRING ")");
   if (!StringPiece(user_agent).ends_with(version)) {
     user_agent += version;
   }

Original file line number	Diff line number	Diff line change
`@@ -595,8 +595,8 @@ void SerfFetch::FixUserAgent() {`
`595`	`595`	`user_agent += "Serf/" SERF_VERSION_STRING;`
`596`	`596`	`}`
`597`	`597`	`GoogleString version = StrCat(`
`598`		`- " ", kModPagespeedSubrequestUserAgent,`
`599`		`- "/" MOD_PAGESPEED_VERSION_STRING "-" LASTCHANGE_STRING);`
	`598`	`+ " (", kModPagespeedSubrequestUserAgent,`
	`599`	`+ "/" MOD_PAGESPEED_VERSION_STRING "-" LASTCHANGE_STRING ")");`
`600`	`600`	`if (!StringPiece(user_agent).ends_with(version)) {`
`601`	`601`	`user_agent += version;`
`602`	`602`	`}`